Merge from mainline.
authorXue Fuqiao <xfq.free@gmail.com>
Sun, 4 Aug 2013 02:59:08 +0000 (10:59 +0800)
committerXue Fuqiao <xfq.free@gmail.com>
Sun, 4 Aug 2013 02:59:08 +0000 (10:59 +0800)
commit0716a105fd74c43b6d9cd2ef82a153f7c896453e
tree847f23c61dadd70b0e8bd57adb0160b19cf1b2c8
parent7e9a4f048c0d3f2abea398aa19c65c7b4df6522b
parent6ea0f8cad0040985bdd7a78ad8e1454e4b230384
Merge from mainline.
lisp/ChangeLog
lisp/vc/vc-dir.el